Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ability to output fast and slow PID on fast-DACs #284

Merged
merged 2 commits into from
Feb 28, 2023
Merged

Ability to output fast and slow PID on fast-DACs #284

merged 2 commits into from
Feb 28, 2023

Conversation

cmf84
Copy link
Contributor

@cmf84 cmf84 commented Aug 24, 2022

Modified bitstream and GUI to allow outputting slow-PID to fast OUT1/OUT2 channels.

Useful for ECDL locking or other systems with two feedback channels, this should resolve the issue described in:
resolve #282

Notes:

  • remaining bug: when disabling slow_PID, the GUI element flips to "ANALOG_OUT0" (slow_PID output is off, though)
  • merging back into master (instead of develop) because of build errors when testing develop branch.

@bleykauf bleykauf changed the base branch from master to feature/slow-integrator-fast-dacs February 28, 2023 10:19
@bleykauf bleykauf merged commit cf61773 into linien-org:feature/slow-integrator-fast-dacs Feb 28, 2023
@bleykauf bleykauf mentioned this pull request Feb 28, 2023
Merged
2 tasks
@bleykauf
Copy link
Collaborator

Thank you @cmf84 !

Moved this to a new PR #312 that is based on the develop branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Two sets of PID for feedback on both OUT 1 and OUT 2.
2 participants
@cmf84 @bleykauf